Lot of refactoring done, probably 40% through with the game. The Engine still builds successfully.