played more with the calendar.  Switched back to intent.

This still needs testing to see if it works, but it should be Beta
ready.