added calendar and clock, this time for real