a bit more defensive
Merge branch 'master' of github.com:jamessha78/BloombergHack_App
Merge branch 'master' of github.com:jamessha78/BloombergHack_App
some fixes and some breaks