refactor
removed shit
readd