Started rtefactoring