Refactoring, added fragments. Preparing for addition of other fragments