little progress on refactoring this stuff