Moved support for forms to controllers

Making forms work!