TODO: update Commands to return expected format, write substitution method