Move into it's own method