WIP. Progress on re-aligning tokens on output.
Tests not subject to re-layout requirement pass
Final tweaks
Adding haddock comment