More work with the Forms api