Trying out separating the helpers.