finished more forms/templates