Added in the date stuff for all the required things