4.7: Henning's Monster Diff

Major rewrite by Henning Brauer, shrunk the code, made it faster, plus