Using the ComputePlan state

In progress, the rest will be uploaded shortly!