needing some attention in Models