feature/CAS

Fixes #35 
Ditch this.