Review of the current code

This is necessary to allow github comments on all the code. Don't
actually merge this!