Add Homework refactored after testing, more methods to refactor