Need to fix numpy sorting and remove zipping