Aquizit

I kinda want to see this testmerged first, to see how it plays, and then make a decision from there.

Got distracted from this by needing to move I will come back to it at another point.