tons of refactoring that I want committed asap