Updated names and classes, added special event scheduling functionality.