wip rebased and have sourcemaps-01 and 02 working