#2 - even more files moved over to MySQLi