the join in the route function is screwing things up.  TODO: Figure why this is breaking things!
Merge remote-tracking branch 'origin/master'