Prep for merge to new GUI system