First set of MAoT Changes 

First set of MAoT Changes (minus test drivers - Avi is going to do them)