Adding additional work from my Boingo days