EVENT-148

@ryancarlson ready for review