Refactors, add sqlite3.