Add the new decoder. WIP.