added post-summer meeting stuff, see TODO