Now uses SQLite3. Added TODO