Full review (do not merge)

Attempted to fix this in c33a366