Database model now supports multi-column primary keys.  And now has more functions.