WIP for @dkillick
Rewrite to use IndexFormatter