Sure.. this is not ready, I have not looked at it for a month.  Sorry, did not mean to push this, the commits need to be cleaned up.