More refactoring of Maschine verses base framework.