Refactor design (WIP)