Change command handling

I don't know if this is going to make everything horrible or not.  We'll
see.