WIP -- extend encoder