added the form module and finished mapping of simple forms