mostly oc stuff

   @celav