Core overhaul

Working on fixing the game logic and thought it prudent to create a
save-point.