Prepare for GUI overhaul