bunch of good stuff
moved some stuff around and commented out debugs