Begin adding more sophisticated command handling.