work in progress - committing while I replace my VM