Huge refactor, add subject descriptions, play 2.3