More work on complete restructuring a font.
Tests seem to be working ok