Implemented mod source re-ordering and started work on task aborting