Date updates; user fns work now
More work on date