TODO, comments, beginning to setup Rig class