midway through refactoring, have to leave computer for a bit