Merging review functionality (Fixes #19, Fixes #21)
Ammended to HEAD, but forgot I had already pushed, trying to fix