Very close now, just a few specs that maybe need the tests fixed