Rejigging where command gets parsed so that I can add "table" command