Rafactoring the names of the functions, and updated the class diagram in Documentation.docx based on the new functions.