iCal Integration update

Review and merge?