Form system rewrite, many messy notes
Committing to untouched offsets