more modular embassy soup, may be broken though
Merge branch 'master' of github.com:morgante/travelwatch