Started re-structuring the async to properly save the entire form