Major Refactoring 2 Started