merged Aaron's spec-class changes.
merged Aaron's dbCode changes