work in progress
Merge github.com:jcurless/CSE220