Oms 148 2

A bit of a hassle with pushes/deletes of oms-148 is caused by the fact that I got confused by github's delayed processing of force pushesh and basically pushed to a different branch.