Keep these with the name they're attached to, rather than breaking the name in the middle.
This is a pretty feature-complete version 1. I don't know why I waited this long to commit anything.