Full review (do not merge)

@witlessbird is this the standard practice now?