Adds Intermediate, updates Expert, and misc changes