WIP for the Papi update.  I am working on it sporadically.  Still a panel or two to do.