Added bootstrap! Major refactoring