made progress on D3 and broke some other things