some bootstrap working
merge