feature/CAS

Fixes #35 
=( Indentation