Added location, and a test!