Added fields and methods to Calendar, created class User