Almost passing the tests, still need to check potential properties