Not ready for review - but good time to merge

I'm still working on it -- but no errors, so its a good time to merge the branch.