MP6 initial commit