More stuff

Suggested reimplementation of location, a contessa fix, and a test form.