Even more formatv2

This PR builds on top of PR #844, in case this one is too big to review