Add some new form fields
Initial draft of distance stuff.