partial implementation of location
latest changes