Adding number formatting

Number formatting failing tests, in progress, broken build.