WiP: move stuff into infos and add test