Feature/ajw cleanup

This is substancially complete and should be tested substncially. I think be are very close (with these changes) to making a release candidate for bindle!!