breaking out some logic
Merge branch 'master' of github.com:onefinestay/rendezvous
Merge branch 'master' of github.com:onefinestay/rendezvous