Lots off stuff and new event system