prepare for refactor, WIP