more hector refactoring, merging repos across machines