location fix
basic working version
basic working version