about to clean up and change shit

about to move a bunch of stuff around, delete commented out things, try
and make formatting better, whatever else i feel like atm