WIP reflect_refactor updates