Work in progress - adding address logic to form