Even more formatv2

This PR relies on PR #844. Deal with that one first if this one is too big