More work on phase 3
Merge branch 'master' of github.com:brianzhang01/hips