Start refactoring 3pm