Refactored the 1.7.2 stuff a bit more

Still much to do, don't bother with it yet.