Passing some tests now :)