Add changes for scheduler being an actual object - committing for test run tomorrow am