Updated db based on some class talk. Will need a few additional changes.