Code is done (I think) but I still need to run the full test and write the report