updated from 5/30 demo

updated in accordance with product owner feedback from demo on 5/30