Initial switch to floppy forms.
Related to #18.