Missed a few hardcoded fields + Waterloo is a constant location