Updated event system. Framework complete