Started integration into new m3wjs framework. (Not ready yet)