- More new feature stuff, separate out DB into easily testable and interchangeable adapters