Added Stuff and done more work on bootstrap