expanded Time class, edited schedule class, moved schedulemaker into Entity