I definitely agree that this should be abstracted and tested