Rebased rustboot, part 3