Adding toggle to Proof of Concept