Rig first pass

* Setup structure for Rig R.P