Added working files
Merge https://github.com/mmerrifield/shipwatch