experimental pica refactor