Re-Add old bootstrap code (still needs cleanup and probably a rewrite..).