Another commit. Still working on cmake errors.