Added a ton of models, still figuring out the storage architecture