DISC2A

Restarting project

Better CAF Eq

Next update from Hubert, Eric and Nik.