Continues refactoring achievement branch