Added more models. Can't test until tomorrow so may be broke