Maybe we should turn this into a pipeline ?
That way we are not mixing concerns