refactor
working on stuff
more