MS 6; order interface complete except for tests
MS 5 redo; improvements, in particular better testing