Reorganize, cleanup, improve tests, support special numbers

Signed-off-by: Eli Skeggs <eskeggs@globesherpa.com>