Continue some major refactoring..