Sounds fragile-ish, I'm hoping there's an easier way