Immensely improved run time. Have to fix introns