continued bootstrap work; made todo