Need to redo all dates using datetime class. Will make things much easier