"still working on this"
refactoring and some unneccessary stuff