Refactored and updated UML
commented out errors