Adding creadhoc stuff and initial work on membership views using creadhoc data
merge