Creation actually saves selected while building

Need to test edit and template forms