Updated to be two forms. Ticket #34.