New (new) number parsing. Doing it all by hand now...

Added more unit tests to catch bad numbers.