WIP Implement abort for new style import