second pass at bootstrappifying