started on name/value data in scenarios
cleanup