Make Number into float64, rather than int
Update TODO
Simplify tokenizer w/ regexp