Close to having fully working creation and modification for models