WIP reborn refactor