incorporated daves changes and unnecessary cmake files.