Cmake 1 - squash me l8r on.
Makefile changes - keep for now.