Lots of refactoring to add SQLite