Work towards getting decoder separated