Wip/install step2

Second attempt, with a nicer API