Dev ms

more work on ms, see commits