added some more stuff, halfway to using sqlite3