got rid of some useless debug
at a point where all of the basics work, still a few bugs but the logic is there
clean up clean up, everybody clean up
merge