Feature/audit context

Story: https://www.pivotaltracker.com/s/projects/593777