Cracked it, refactored to add the formatter directly to the start