CONTENT: start working on ocs_2
CONTENT: fix up the ocs_1 -> ocs_2 transition a bit
CONTENT: a little more work on ocs_2 start