Not yet solved but all tests seem to be working