Updated #clint-works

Re-engineered/simplified toggle method between client works