Create if not

fix for #381, built on top of #380 because I needed to test it, can remove that commit