The future of this is in question currently and unless it's actually going to be used more than once I see little point in making it more complicated