cleaning up the code

incomplete
just commiting now so i can continue on another computer