Third Edit - Still Testing
Merge https://github.com/CaltechHggApp/HggSummerCode13