Early work for saving form