core: fix :bug:
core: WIP connecting loose ends