Working on implementing matrix constants in the new grammar