WIP. Progress on re-aligning tokens on output.