Added referential checks for locations and area.. not quite working.