#1 Adding Database Functionality