Swap interface

Make everything async except for form submission.