Feature cmake modules

May want to merge master with develop...