Temp commit, need to finish refactoring