not done, just committing to continue work on a different computer