move more stuff out of C-c
mc