persistence handlers first. Events renamed
todo left