Fixes #4 adds basic location implementation