Finishing Database Support (Hopefully)
Merge origin/master