changes

been a while, think just refactoring