Initial commit of slightly cleaned up bootstrap