WIP: more cleanup and started on get/insert Event