more work on reviews
some refactoring to make models fatter