Major refactoring: do some combining of database tables to make MySQL and newsrdr users a lot happier.