Moved bootstrap around.
Updated TODO