Ported two more forms recipes

@jakemac53 @sigmundch PTAL.