Clean up capture and tie it into dig_core