first pass doctrine conversion. refs #1227