A little more work on this, just had an epiphany, the whole thing will change tomorrow. :P