Feature/create if necessary

80/100c