Updated Classes to Include Schedules

A few updates to make it possible to make schedules.