checking the branches
zach's note on how to make merge this with video