Refactoring more-or-less completed
more stuff