Database code
Database Commit 2
Merge Fixes