Update to latest and more work