tired now - think the tests (up to ending in 7 now) aren't really testing the code (for some reason). Look at it tomorrow