Cleaning up models, still working on getting thumbnails select working