This feels like it would be better in a new patch