Work on #61 - Prepare form submission