WIP getting the thing to load/build with steal
Some fixups