WIP reflect_refactor work