Tweaked some CMakeList.txts.  Successfully builds the makefile.  Make fails currently