forgot to save some stuff, added some more model stuff