All the tests are passing... I think the logic part is done