Overworld mostly works now

Still needs some refinement