Started major refactoring work
Started major refactoring work