Started adding form fields, toString in entities