more future rebase commits!

    Also I am haxing things fairly badly so probably best not to use this code
    at all.