pre-refactor commit
commiting changes at end of weekend!