Dynamic command replacement. Closes #54