2061: big refactor

prepare for next change!