Move bootstrap out.  More conversion to async