incremental bootstrapping update
progress
further work
first working version