Partial Implementation

Partial Implementation of PO due to discovery