Spring cleaning
Finished the last requirement and found a broken one