Things

Again, see commits
Doesn't have a resolution one way or the other for #780, I'm awaiting feedback