Need to fix form() add functionality