Splitting functionality into 2 methods in order to start generalising
functionality into helpers.py