Removed the code duplication and refactored, just need to id more smells, work Schedule.java, and add the 2 features