moved helpers around added model year views