Started refactoring code to use Item's rather than Genre's. Currently broken.
Merged with Adam's comments.