Okay, I can merge in so I can do the demo tomorrow but it will need a few more rounds of cleanup.