Passed CQC, and seems to run
Fixes, passes test set now