Started working on removing old code and adding mgen+mnet