Fixed Number and tests, updated TODO.md