Can now deal with schedule overrides

Code needs oh so much refactor