done for the night, fixed some minor things, still borkened
intermittent commit #666
fixed conflicts
pathing currently works
fixed merge conflicts