location now implemented and further tests working