Leaving this for a bit, working on design