Many changes to do with demo at Brown.  Most notably, typeshifting (with many
examples)