Another intermediate update, still fixing the PB table edit stuff