Should this move to the helpers.js?