more WIP, some renaming of anchors