David's command system update!  Better late than never!