Fixed the bootstrap code - still need to figure out what the bug is...