More WIP on new location form