deleted stuff
mostly working