we still need to handle the abort case somehow- Where is that handled now?