Finish draft of duck types