this feels so much better in Models