EVENT-144

@ryancarlson ready for your review