Working that out with @henrycjjackson soonish