WIP reflect_refactor