Cmake fixes. Subject class changes.
Cmake changes. Todo update.