Better abstracted targetting, so we can test better