dissertation
merge diss stuff