added calendar, have to deal with settings