more refactoring... hopping to get to real work soon