Flesh out MVC Skill, Expert, Event
fix merge