First shot at issue #101

Will try out in preprod. Need feedback from @ceci.
No reporting feature yet.