still fixing login flows but needed to merge due to date formatting still in milliseconds
CONFLICTS NOT MERGED YET