-adding more nice stuff that can be bootstrapped but it is not quite
ready right now.