moved files from old CKB
Merge branch 'david' into matt
Merged Dave's and matt's files