adamwespiser refactor model gen and add in model save code