Initial commit with sqlite3 fix 2