I'd rather just get this merged rather than go on endlessly about what we *could* do. As it is now I know it works so I'd rather not take the risk of changing it all and causing it to regress.