I'll probably move that into the new helper file