WIP -- refactor