Last work before pre-retreat
Merge branch 'master' of github.com:brianzhang01/hips