Location on hub jan9 - take 2

Okay, I think this is good enough to go into master. Please review the changes and not you will need to run db:migrate and db:seed, there's a substantial change in seed data to ensure we can see what's being shown more clearly.