Location fields

fixes #11