EVENT-153

@ryancarlson ready for review