Pre-MS2 commit (not finished)

committing before heavy work on ms2 stuff