Tunis surprise

I am going to merge the progress I made on the adhoc clip adding into master b/c I feel that it is worthwhile to have these features. We can also deal with refactoring later, in terms of the changes I made vs. the changes that Josh is making in the various fragment/clip data models.