working on stuff
more working changes
more working changes 2