Make date/time work

Need to check if date is correct