moves relevant code to instrumetation leaving callbacks really thin