Add genre

Another big one.

EDIT: I probably should have squashed that last commit, sorry!