Work in Class

Implement some of the feedback you received during last week's playtesting sessions.