somewhere in there

refactoring things