Partial update to fixing insert problem

This version fails tests for inserting events.