last tidbits before migration
migrated to event system

yh that wasn't fun