Slight Over Haul

Temp locations, game not implemented yet, cleaned code.