Refactor some date code and add week reports