Part two of implementing multiple Primary Keys.  Works now.