Some progress with cmake...