add bootstrap support step one
finish applying initial bootstrap code