Added Name, Start, and End. Pending cleanup + Calendar import