Step 3 of Complete Refactor

Got the player back in there, with the area's that can be seen.