More work … still not working yet :) shoulda made this a branch.