Final Calendar

Added single date functionality, cleaned up code