Revert & Re-try: OC/UV Implement

disregard earlier OC & UV commits