So I haven't posted much in this thread recently, but I felt like giving a small progress report as I finally have a chance to write. If anyone happened to check in on the git project recently, you'll have noticed that a number of bugfixes and additions have been made in the past week or so. Next on the list is to convert the abominable task system to use an actual 'Task' container object (currently 'tasks' are simply references to Collectable or Space objects, with what actually needs to be done with that Collectable or Space being inferred by the raider based on the task's properties; this system was fine for prototyping when there were only a few task types implemented, but at this point it needs to go, as one Space can easily have numerous concurrent active tasks such as to be drilled, reinforced, and blasted with dynamite, which leads to ambiguity). This is not going to be a fun change to implement, as tasks in their current, sloppy form are used all over the place in the Raider update method as well as in the user-interaction portions of the main update loop, but I hope to have enough time and energy to sit down and get it done at some point soon. Additionally, all variables pertaining to gamestate are now better maintained and initialized via methods rather than just being dumped at the bottom of the main file, and more levels have been (mostly) converted in preparation for the move to a proper UI and menu screen. I'm a bit too tired to summarize the complete list of changes at the moment, but for anyone interested I urge you to take a peek at the project commit history from these past two weeks: https://github.com/rystills/rock-raiders-remake/commits/master