feat(builder): seems to work quite good, need to add a bunch of tests