Make sure location stuff is merged in

I think I already took this into account somehow, but need to make sure.