Preserve, yet Move, Nikolai's interface

(We'll probably remerge them later)
C++ library