S3 work underway...
S3 work
cleanup
using CalendarTime