modifications, need to finish the calendar @todo FIX ALL DATES, SAVE AND
LOAD DATES