RF: refactor to use terryfy

Work in progress

[skip ci]