Keep state in object
Merge branch 'CR-2' of github.com:VorskiImagineering/C3PO into CR-2