Working
I got all the tests working