Saturday morning sprint

added a bootstrap flavour
Revert "Saturday morning sprint"

This reverts commit 2df56aeff18311e95ff9e531abcb6fb44bcb044a.
ReAdd