Code is now working and passes all tests