Finished cass1
Add cass2 initial work. Untested, possibly complete.