adding back in calendar functionality