Updates for first IAP meeting. Fixes #2. Fixes #3.