Added date and number parsing.
Renamed number parser for brevity.
Major refactoring.