Collation edit

A ton of commits to enable collation editing.