FakeDatabase and stuff
Merge remote-tracking branch 'jreale4/master'
Merged with John.