whole lot of refactoring, but way more to come as well, eventually. 
Just starting on the entry hierarchy.