Added additional I-types (everything but the last 2 branches i think).
Please Debug.