Pre-mini conference checkpoint

This is just a tagged release so that I can safely continue working before the Mini-conference which is planned for tomorrow and return to this point if I mess something up.