First Major Changes and Google
Merge github.com:berjoyner/Notaphily