finished donut
merged roughly