move MMR into datasource, menu changes, kind of major files moving around