P2 of DBGeneral/Final.  Next step involves DB changes