Handle error/success correctly
Cleaning up before I leave for the day