Continue to work on form