Changed the form to be more like adding an assignment