Bit more work on CMake build - need to decide if we're going to duplicate the 'lots of small libs' approach or just build one library...