refactoring is complete, testing and preparing for release now