Missed a few hardcoded fields + Waterloo is a constant location
I guess it's not "My" anymore!
Merge pull request #2 from jacobwills/master

Missed a few hardcoded fields + Waterloo is a constant location