Toolkit in, bootstrap out. 

Some stuff very likely broken - will fix it as we go.