Continue the merge of Mict-peat into a trunk version of ORC, and a simple test simulation now works. Further cleaning and improvements are necessary.