[wip] reworking from base