Began merging db functionality into Manager