More work on the new stuff that will eventually be coming to m2exp version 1.0