Going on with major refactoring