Stage 2 done and bootstrap has been added