Overhaul entire d line

Definitely need some bulk in the middle