these are incomplete updates, but I want to merge with master, and work
from there, I'm still confused about how to use git.