WIP1
[NOJIRA]
added person and role id to outcome
WIP2
Merge branch 'testing'