Separate out bootstrap code from my own