minor factoring improvements
more incremental factoring
started migrating events to bin
migrated events to bin, still works