Midway through converting rest of addon over to new db structure.