Big changes to structure. Commit before allowing user variable panes