Ax

Modify MatOnto to handle Atoms better