New Upload
Merge https://github.com/ddfelts/hawk2.0