New Commit adding basic event system and other fixes