Remixes of "major main oc redesign"

Feedback