Added geolocation stuff to form
Resolve merge clash
Form update
Unique keys without sqlite dep