Might be good to add a #TODO to remove this and make it private or something?