OK, submitted new implementation.  Sorry if I am making your life difficult with these initial commits, but still trying to figure out what is where, where which API's are, etc etc.