Added various functionality, creating locations mainly.