Work some more on the new command handler

Still have a decent amount of work to do, but this is a start.