Added more models and moved stuff and stuff