feature/CAS

Fixes #35 
Included three times?