diff --git a/react-common/components/controls/Button.tsx b/react-common/components/controls/Button.tsx
index eeee5ab0f21e..143d693092ce 100644
--- a/react-common/components/controls/Button.tsx
+++ b/react-common/components/controls/Button.tsx
@@ -21,6 +21,7 @@ export interface ButtonViewProps extends ContainerProps {
     ariaPosInSet?: number;
     ariaSetSize?: number;
     ariaSelected?: boolean;
+    ariaPressed?: boolean | "mixed";
 }
 
 
@@ -44,6 +45,7 @@ export const Button = (props: ButtonProps) => {
         ariaPosInSet,
         ariaSetSize,
         ariaSelected,
+        ariaPressed,
         role,
         onClick,
         onKeydown,
@@ -101,7 +103,8 @@ export const Button = (props: ButtonProps) => {
             aria-posinset={ariaPosInSet}
             aria-setsize={ariaSetSize}
             aria-describedby={ariaDescribedBy}
-            aria-selected={ariaSelected}>
+            aria-selected={ariaSelected}
+            aria-pressed={ariaPressed}>
                 {(leftIcon || rightIcon || label) && (
                     <span className="common-button-flex">
                         {leftIcon && <i className={leftIcon} aria-hidden={true}/>}
diff --git a/teachertool/src/App.tsx b/teachertool/src/App.tsx
index 893c2fbfe5c9..bcf40daf2830 100644
--- a/teachertool/src/App.tsx
+++ b/teachertool/src/App.tsx
@@ -6,12 +6,10 @@ import * as Actions from "./state/actions";
 import * as NotificationService from "./services/notificationService";
 import { downloadTargetConfigAsync } from "./services/backendRequests";
 import { logDebug } from "./services/loggingService";
-
 import { HeaderBar } from "./components/HeaderBar";
 import { MainPanel } from "./components/MainPanel";
 import { Notifications } from "./components/Notifications";
 import { CatalogModal } from "./components/CatalogModal";
-
 import { postNotification } from "./transforms/postNotification";
 import { loadCatalogAsync } from "./transforms/loadCatalogAsync";
 import { loadValidatorPlansAsync } from "./transforms/loadValidatorPlansAsync";
@@ -27,6 +25,7 @@ export const App = () => {
     useEffect(() => {
         if (ready && !inited) {
             NotificationService.initialize();
+
             Promise.resolve().then(async () => {
                 const cfg = await downloadTargetConfigAsync();
                 dispatch(Actions.setTargetConfig(cfg || {}));
@@ -35,17 +34,13 @@ export const App = () => {
                 // Load catalog and validator plans into state.
                 await loadCatalogAsync();
                 await loadValidatorPlansAsync();
-
                 await tryLoadLastActiveRubricAsync();
 
-                // TODO: Remove this. Delay app init to expose any startup race conditions.
-                setTimeout(() => {
-                    // Test notification
-                    postNotification(makeNotification("🎓", 2000));
-                    setInited(true);
+                // Test notification
+                postNotification(makeNotification("🎓", 2000));
 
-                    logDebug("App initialized");
-                }, 10);
+                setInited(true);
+                logDebug("App initialized");
             });
         }
     }, [ready, inited]);
diff --git a/teachertool/src/components/RubricWorkspace.tsx b/teachertool/src/components/RubricWorkspace.tsx
index 62ed16b03cb8..92af155282b3 100644
--- a/teachertool/src/components/RubricWorkspace.tsx
+++ b/teachertool/src/components/RubricWorkspace.tsx
@@ -9,7 +9,6 @@ import { TabGroup, TabButton } from "./TabGroup";
 import { TabPanel } from "./TabPanel";
 import { EvalResultDisplay } from "./EvalResultDisplay";
 import { ActiveRubricDisplay } from "./ActiveRubricDisplay";
-import { ToolbarControlGroup, ToolbarButton, ToolbarMenuDropdown } from "./ToolbarControls";
 import { MenuItem } from "react-common/components/controls/MenuDropdown";
 import { TabName } from "../types";
 import { runEvaluateAsync } from "../transforms/runEvaluateAsync";
@@ -17,6 +16,7 @@ import { writeRubricToFile } from "../services/fileSystemService";
 import { showModal } from "../transforms/showModal";
 import { isProjectLoaded } from "../state/helpers";
 import { setActiveTab } from "../transforms/setActiveTab";
+import { setAutorun } from "../transforms/setAutorun";
 
 function handleImportRubricClicked() {
     showModal("import-rubric");
@@ -58,6 +58,21 @@ const WorkspaceTabPanels: React.FC = () => {
     );
 };
 
+const WorkspaceAutorun: React.FC = () => {
+    const { state: teacherTool } = useContext(AppStateContext);
+    const { autorun } = teacherTool;
+
+    const onChange = (checked: boolean) => {
+        setAutorun(checked);
+    };
+
+    return (
+        <Toolbar.ControlGroup>
+            <Toolbar.Toggle label={lf("auto-run")} isChecked={autorun} onChange={onChange} />
+        </Toolbar.ControlGroup>
+    );
+};
+
 function getActionMenuItems(tab: TabName): MenuItem[] {
     switch (tab) {
         case "rubric":
@@ -87,20 +102,20 @@ const WorkspaceToolbarButtons: React.FC = () => {
     const actionItems = getActionMenuItems(activeTab);
 
     return (
-        <ToolbarControlGroup>
+        <Toolbar.ControlGroup>
             {activeTab === "results" && (
-                <ToolbarButton icon="fas fa-print" title={lf("Print")} onClick={() => console.log("Print")} />
+                <Toolbar.Button icon="fas fa-print" title={lf("Print")} onClick={() => console.log("Print")} />
             )}
 
-            <ToolbarButton
+            <Toolbar.Button
                 icon="fas fa-play"
                 title={lf("Evaluate")}
                 onClick={handleEvaluateClickedAsync}
                 disabled={!isProjectLoaded(teacherTool)}
             />
 
-            <ToolbarMenuDropdown title={lf("More Actions")} items={actionItems} disabled={!actionItems.length} />
-        </ToolbarControlGroup>
+            <Toolbar.MenuDropdown title={lf("More Actions")} items={actionItems} disabled={!actionItems.length} />
+        </Toolbar.ControlGroup>
     );
 };
 
@@ -109,7 +124,7 @@ interface IProps {}
 export const RubricWorkspace: React.FC<IProps> = () => {
     return (
         <div className={css.panel}>
-            <Toolbar left={<WorkspaceTabButtons />} right={<WorkspaceToolbarButtons />} />
+            <Toolbar left={<WorkspaceTabButtons />} center={<WorkspaceAutorun />} right={<WorkspaceToolbarButtons />} />
             <WorkspaceTabPanels />
         </div>
     );
diff --git a/teachertool/src/components/Toolbar.tsx b/teachertool/src/components/Toolbar.tsx
index a0ffaa21ce38..0db4a28f6222 100644
--- a/teachertool/src/components/Toolbar.tsx
+++ b/teachertool/src/components/Toolbar.tsx
@@ -3,14 +3,72 @@ import * as React from "react";
 import css from "./styling/Toolbar.module.scss";
 
 import { classList } from "react-common/components/util";
+import { Button, ButtonProps } from "react-common/components/controls/Button";
+import { MenuDropdown, MenuDropdownProps } from "react-common/components/controls/MenuDropdown";
 
-interface IProps {
+interface ToolbarButtonProps extends ButtonProps {
+    icon: string;
+}
+
+const ToolbarButton: React.FC<ToolbarButtonProps> = props => {
+    return (
+        <Button {...props} className={classList(css["toolbar-button"], "tt-toolbar-button")} rightIcon={props.icon} />
+    );
+};
+
+interface ToolbarControlGroupProps extends React.PropsWithChildren<{}> {}
+
+const ToolbarControlGroup: React.FC<ToolbarControlGroupProps> = ({ children }) => {
+    return <div className={classList(css["toolbar-control-group"], "tt-toolbar-control-group")}>{children}</div>;
+};
+
+interface ToolbarMenuDropdownProps extends MenuDropdownProps {}
+
+const ToolbarMenuDropdown: React.FC<ToolbarMenuDropdownProps> = props => {
+    const dropdownLabel = <i className={"fas fa-ellipsis-v"} />;
+    return (
+        <MenuDropdown
+            {...props}
+            className={classList(css["toolbar-menu-dropdown"], "tt-toolbar-menu-dropdown")}
+            label={dropdownLabel}
+        />
+    );
+};
+
+interface ToolbarToggleProps {
+    label: string;
+    isChecked: boolean;
+    onChange: (checked: boolean) => void;
+}
+
+const ToolbarToggle: React.FC<ToolbarToggleProps> = ({ label, isChecked, onChange }) => {
+    const [checked, setChecked] = React.useState(isChecked);
+
+    const onClick = () => {
+        setChecked(!checked);
+        onChange(!checked);
+    };
+
+    return (
+        <Button
+            className={css["toggle-button"]}
+            title={label}
+            label={label}
+            ariaLabel={label}
+            onClick={onClick}
+            rightIcon={checked ? "fas fa-toggle-on" : "fas fa-toggle-off"}
+            ariaPressed={checked}
+        />
+    );
+};
+
+interface ToolbarControlProps {
     left?: React.ReactNode;
     center?: React.ReactNode;
     right?: React.ReactNode;
 }
 
-export const Toolbar: React.FC<IProps> = ({ left, center, right }) => {
+const ToolbarControl: React.FC<ToolbarControlProps> = ({ left, center, right }) => {
     return (
         <div className={classList(css["toolbar"], "tt-toolbar")}>
             <div className={classList(css["left"], "tt-toolbar-left")}>{left}</div>
@@ -19,3 +77,10 @@ export const Toolbar: React.FC<IProps> = ({ left, center, right }) => {
         </div>
     );
 };
+
+export const Toolbar = Object.assign(ToolbarControl, {
+    Button: ToolbarButton,
+    ControlGroup: ToolbarControlGroup,
+    MenuDropdown: ToolbarMenuDropdown,
+    Toggle: ToolbarToggle,
+});
diff --git a/teachertool/src/components/ToolbarControls.tsx b/teachertool/src/components/ToolbarControls.tsx
deleted file mode 100644
index e9effc94ec54..000000000000
--- a/teachertool/src/components/ToolbarControls.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import * as React from "react";
-// eslint-disable-next-line import/no-internal-modules
-import css from "./styling/ToolbarControls.module.scss";
-
-import { classList } from "react-common/components/util";
-import { Button, ButtonProps } from "react-common/components/controls/Button";
-import { MenuDropdown, MenuDropdownProps } from "react-common/components/controls/MenuDropdown";
-
-export interface ToolbarButtonProps extends ButtonProps {
-    icon: string;
-}
-
-export const ToolbarButton: React.FC<ToolbarButtonProps> = props => {
-    return (
-        <Button {...props} className={classList(css["toolbar-button"], "tt-toolbar-button")} rightIcon={props.icon} />
-    );
-};
-
-export interface ToolbarControlGroupProps extends React.PropsWithChildren<{}> {}
-
-export const ToolbarControlGroup: React.FC<ToolbarControlGroupProps> = ({ children }) => {
-    return <div className={classList(css["toolbar-control-group"], "tt-toolbar-control-group")}>{children}</div>;
-};
-
-export interface ToolbarMenuDropdownProps extends MenuDropdownProps {}
-
-export const ToolbarMenuDropdown: React.FC<ToolbarMenuDropdownProps> = props => {
-    const dropdownLabel = <i className={"fas fa-ellipsis-v"} />;
-    return (
-        <MenuDropdown
-            {...props}
-            className={classList(css["toolbar-menu-dropdown"], "tt-toolbar-menu-dropdown")}
-            label={dropdownLabel}
-        />
-    );
-};
diff --git a/teachertool/src/components/styling/RubricWorkspace.module.scss b/teachertool/src/components/styling/RubricWorkspace.module.scss
index 29fb1b18f501..540573c58342 100644
--- a/teachertool/src/components/styling/RubricWorkspace.module.scss
+++ b/teachertool/src/components/styling/RubricWorkspace.module.scss
@@ -14,4 +14,8 @@
     div[class*="tt-tabview"] {
         flex: 1 1 0%;
     }
+
+    div[class*="tt-toolbar-center"] {
+        flex-grow: 1;
+    }
 }
diff --git a/teachertool/src/components/styling/Toolbar.module.scss b/teachertool/src/components/styling/Toolbar.module.scss
index 98da9f776b2b..ffe69ef88ff4 100644
--- a/teachertool/src/components/styling/Toolbar.module.scss
+++ b/teachertool/src/components/styling/Toolbar.module.scss
@@ -10,3 +10,127 @@
     color: var(--pxt-content-foreground);
 }
 
+@mixin toolbar-font-size {
+    font-size: 1rem;
+}
+
+@mixin toolbar-button {
+    margin: 0;
+    padding: 0;
+    width: 1.75rem;
+    height: 1.75rem;
+    border-radius: 0.25rem;
+    background-color: var(--pxt-content-background);
+    color: var(--pxt-content-foreground);
+    @include toolbar-font-size;
+
+    &:hover {
+        filter: none;
+        background-color: var(--pxt-headerbar-background-glass);
+    }
+
+    &:active,
+    &:active::after {
+        filter: brightness(.80) contrast(1.3);
+        background-color: var(--pxt-headerbar-background-glass);
+    }
+
+    &:focus-visible,
+    &:focus-visible::after {
+        border: none;
+        outline: solid 1px var(--pxt-content-foreground);
+    }
+
+    i[class*="fas"] {
+        margin: 0;
+        width: auto;
+        height: auto;
+        @include toolbar-font-size;
+
+        &::before {
+            @include toolbar-font-size;
+        }
+    }
+}
+
+.toolbar-control-group {
+    display: flex;
+    min-height: 100%;
+    align-items: center;
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+    gap: 0.125rem;
+
+    button {
+        @include toolbar-button;
+    }
+
+    button[class*="menu-button"] {
+        @include toolbar-button;
+
+        &[class*="expanded"] {
+            background-color: var(--pxt-headerbar-background-glass);
+        }
+    }
+
+    button[class*="disabled"] {
+        color: var(--pxt-headerbar-accent-smoke);
+        background-color: inherit;
+    }
+
+    div[class*="common-focus-trap"] {
+        outline: none;
+    }
+
+    div[class*="common-menu-dropdown-pane"] {
+        background-color: var(--pxt-content-background);
+        border: 1px solid var(--pxt-content-accent);
+        border-radius: 0.25rem;
+        padding: 0.25rem 0;
+        box-shadow: 0 0.5rem 0.5rem 0 #00000020;
+    }
+
+    ul {
+        background-color: inherit;
+
+        li {
+            background-color: inherit;
+            padding: 0;
+
+            button[class*="common-button"] {
+                height: auto;
+                padding: 0.5rem 0.5rem;
+                border-radius: 0;
+
+                &:focus-visible::after {
+                    border: none;
+                    outline: solid 1px var(--pxt-content-foreground);
+                }
+            }
+        }
+
+        li:first-child {
+            padding-top: 0.125rem;
+        }
+
+        li:last-child {
+            padding-bottom: 0.125rem;
+        }
+    }
+
+    .toggle-button {
+        display: flex;
+        align-items: center;
+        text-transform: uppercase;
+        font-weight: bold;
+        font-size: 0.75rem;
+        width: auto;
+        padding: 0 0.25rem;
+
+        span[class*="common-button-flex"] {
+            display: flex;
+            align-items: center;
+            gap: 0.25rem;
+        }
+    }
+}
diff --git a/teachertool/src/components/styling/ToolbarControls.module.scss b/teachertool/src/components/styling/ToolbarControls.module.scss
deleted file mode 100644
index 9326ccc41c8e..000000000000
--- a/teachertool/src/components/styling/ToolbarControls.module.scss
+++ /dev/null
@@ -1,106 +0,0 @@
-@mixin toolbar-font-size {
-    font-size: 1rem;
-}
-
-@mixin toolbar-button {
-    margin: 0;
-    padding: 0;
-    width: 1.75rem;
-    height: 1.75rem;
-    border-radius: 0.25rem;
-    background-color: var(--pxt-content-background);
-    color: var(--pxt-content-foreground);
-    @include toolbar-font-size;
-
-    &:hover {
-        filter: none;
-        background-color: var(--pxt-headerbar-background-glass);
-    }
-
-    &:active::after {
-        filter: brightness(.80) contrast(1.3);
-        background-color: var(--pxt-headerbar-background-glass);
-    }
-
-    &:focus-visible::after {
-        border: none;
-        outline: solid 1px var(--pxt-content-foreground);
-    }
-
-    i[class*="fas"] {
-        margin: 0;
-        width: auto;
-        height: auto;
-        @include toolbar-font-size;
-
-        &::before {
-            @include toolbar-font-size;
-        }
-    }
-}
-
-.toolbar-control-group {
-    display: flex;
-    min-height: 100%;
-    align-items: center;
-    padding-left: 0.5rem;
-    padding-right: 0.5rem;
-    gap: 0.125rem;
-
-    button {
-        @include toolbar-button;
-    }
-
-    button[class*="menu-button"] {
-        @include toolbar-button;
-
-        &[class*="expanded"] {
-            background-color: var(--pxt-headerbar-background-glass);
-        }
-    }
-
-    button[class*="disabled"] {
-        color: var(--pxt-headerbar-accent-smoke);
-        background-color: inherit;
-    }
-
-    div[class*="common-focus-trap"] {
-        outline: none;
-    }
-
-    div[class*="common-menu-dropdown-pane"] {
-        background-color: var(--pxt-content-background);
-        border: 1px solid var(--pxt-content-accent);
-        border-radius: 0.25rem;
-        padding: 0.25rem 0;
-        box-shadow: 0 0.5rem 0.5rem 0 #00000020;
-    }
-
-    ul {
-        background-color: inherit;
-
-        li {
-            background-color: inherit;
-            padding: 0;
-
-            button[class*="common-button"] {
-                height: auto;
-                padding: 0.5rem 0.5rem;
-                border-radius: 0;
-
-                &:focus-visible::after {
-                    border: none;
-                    outline: solid 1px var(--pxt-content-foreground);
-                }
-            }
-        }
-
-        li:first-child {
-            padding-top: 0.125rem;
-        }
-
-        li:last-child {
-            padding-bottom: 0.125rem;
-        }
-    }
-}
diff --git a/teachertool/src/config.json b/teachertool/src/config.json
deleted file mode 100644
index 2c63c0851048..000000000000
--- a/teachertool/src/config.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/teachertool/src/services/autorunService.ts b/teachertool/src/services/autorunService.ts
new file mode 100644
index 000000000000..fe46ed056fa1
--- /dev/null
+++ b/teachertool/src/services/autorunService.ts
@@ -0,0 +1,18 @@
+import { stateAndDispatch } from "../state";
+import { isProjectLoaded } from "../state/helpers";
+import { runEvaluateAsync } from "../transforms/runEvaluateAsync";
+
+let autorunTimer: NodeJS.Timeout | null = null;
+
+export function poke() {
+    if (autorunTimer) {
+        clearTimeout(autorunTimer);
+    }
+    autorunTimer = setTimeout(() => {
+        autorunTimer = null;
+        const { state } = stateAndDispatch();
+        if (state.autorun && isProjectLoaded(state)) {
+            runEvaluateAsync();
+        }
+    }, 1000);
+}
diff --git a/teachertool/src/services/localStorage.ts b/teachertool/src/services/localStorage.ts
new file mode 100644
index 000000000000..ca49d45cb6de
--- /dev/null
+++ b/teachertool/src/services/localStorage.ts
@@ -0,0 +1,36 @@
+import { ErrorCode } from "../types/errorCode";
+import { logError } from "./loggingService";
+
+const KEY_PREFIX = "teachertool";
+const AUTORUN_KEY = [KEY_PREFIX, "autorun"].join("/");
+
+function getValue(key: string, defaultValue?: string): string | undefined {
+    return localStorage.getItem(key) || defaultValue;
+}
+
+function setValue(key: string, val: string) {
+    localStorage.setItem(key, val);
+}
+
+function delValue(key: string) {
+    localStorage.removeItem(key);
+}
+
+function getAutorun(): boolean {
+    try {
+        return getValue(AUTORUN_KEY, "false") === "true";
+    } catch (e) {
+        logError(ErrorCode.localStorageReadError, e);
+        return false;
+    }
+}
+
+function setAutorun(autorun: boolean) {
+    try {
+        setValue(AUTORUN_KEY, autorun.toString());
+    } catch (e) {
+        logError(ErrorCode.localStorageWriteError, e);
+    }
+}
+
+export { getAutorun, setAutorun };
diff --git a/teachertool/src/services/makecodeEditorService.ts b/teachertool/src/services/makecodeEditorService.ts
index 6c96997cfc62..7333453bb2a4 100644
--- a/teachertool/src/services/makecodeEditorService.ts
+++ b/teachertool/src/services/makecodeEditorService.ts
@@ -2,6 +2,7 @@
 
 import { ErrorCode } from "../types/errorCode";
 import { logDebug, logError } from "./loggingService";
+import * as AutorunService from "./autorunService";
 
 interface PendingMessage {
     original: pxt.editor.EditorMessageRequest;
@@ -22,6 +23,7 @@ function onMessageReceived(event: MessageEvent) {
         if (data.action === "editorcontentloaded") {
             readyForMessages = true;
             sendMessageAsync(); // flush message queue.
+            AutorunService.poke();
         }
 
         if (data.id && pendingMessages[data.id]) {
diff --git a/teachertool/src/state/actions.ts b/teachertool/src/state/actions.ts
index bf838327e110..ea77348ec64a 100644
--- a/teachertool/src/state/actions.ts
+++ b/teachertool/src/state/actions.ts
@@ -74,6 +74,11 @@ type SetActiveTab = ActionBase & {
     tabName: TabName;
 };
 
+type SetAutorun = ActionBase & {
+    type: "SET_AUTORUN";
+    autorun: boolean;
+};
+
 /**
  * Union of all actions
  */
@@ -91,7 +96,8 @@ export type Action =
     | ShowModal
     | HideModal
     | SetValidatorPlans
-    | SetActiveTab;
+    | SetActiveTab
+    | SetAutorun;
 
 /**
  * Action creators
@@ -160,6 +166,11 @@ const setActiveTab = (tabName: TabName): SetActiveTab => ({
     tabName,
 });
 
+const setAutorun = (autorun: boolean): SetAutorun => ({
+    type: "SET_AUTORUN",
+    autorun,
+});
+
 export {
     postNotification,
     removeNotification,
@@ -174,4 +185,5 @@ export {
     hideModal,
     setValidatorPlans,
     setActiveTab,
+    setAutorun,
 };
diff --git a/teachertool/src/state/appStateContext.tsx b/teachertool/src/state/appStateContext.tsx
index 846e32cbfcf9..feadcf7cc4b1 100644
--- a/teachertool/src/state/appStateContext.tsx
+++ b/teachertool/src/state/appStateContext.tsx
@@ -2,8 +2,8 @@ import React, { createContext, useEffect, useReducer } from "react";
 import { AppState, initialAppState } from "./state";
 import { Action } from "./actions";
 import reducer from "./reducer";
-import configData from "../config.json";
 import assert from "assert";
+import * as LocalStorage from "../services/localStorage";
 
 let state: AppState;
 let dispatch: React.Dispatch<Action>;
@@ -41,6 +41,7 @@ export function AppStateProvider(props: React.PropsWithChildren<{}>): React.Reac
     // Create the application state and state change mechanism (dispatch)
     const [state_, dispatch_] = useReducer(reducer, {
         ...initialAppState,
+        autorun: LocalStorage.getAutorun(),
         flags: {
             ...initialAppState.flags,
             testCatalog,
diff --git a/teachertool/src/state/reducer.ts b/teachertool/src/state/reducer.ts
index 9fbb6735435a..2b5f79e0f3a2 100644
--- a/teachertool/src/state/reducer.ts
+++ b/teachertool/src/state/reducer.ts
@@ -97,5 +97,11 @@ export default function reducer(state: AppState, action: Action): AppState {
                 activeTab: action.tabName,
             };
         }
+        case "SET_AUTORUN": {
+            return {
+                ...state,
+                autorun: action.autorun,
+            };
+        }
     }
 }
diff --git a/teachertool/src/state/state.ts b/teachertool/src/state/state.ts
index f9ea15f7880e..fc6c39d9f278 100644
--- a/teachertool/src/state/state.ts
+++ b/teachertool/src/state/state.ts
@@ -12,6 +12,7 @@ export type AppState = {
     modal: ModalType | undefined;
     activeTab: TabName;
     validatorPlans: pxt.blocks.ValidatorPlan[] | undefined;
+    autorun: boolean;
     flags: {
         testCatalog: boolean;
     };
@@ -26,6 +27,7 @@ export const initialAppState: AppState = {
     modal: undefined,
     activeTab: "rubric",
     validatorPlans: undefined,
+    autorun: false,
     flags: {
         testCatalog: false,
     },
diff --git a/teachertool/src/transforms/addCriteriaToRubric.ts b/teachertool/src/transforms/addCriteriaToRubric.ts
index c262831564dd..a61c8db77dab 100644
--- a/teachertool/src/transforms/addCriteriaToRubric.ts
+++ b/teachertool/src/transforms/addCriteriaToRubric.ts
@@ -5,6 +5,7 @@ import { logDebug, logError } from "../services/loggingService";
 import { CriteriaInstance, CriteriaParameterValue } from "../types/criteria";
 import { nanoid } from "nanoid";
 import { ErrorCode } from "../types/errorCode";
+import * as AutorunService from "../services/autorunService";
 
 export function addCriteriaToRubric(catalogCriteriaIds: string[]) {
     const { state: teacherTool, dispatch } = stateAndDispatch();
@@ -45,6 +46,7 @@ export function addCriteriaToRubric(catalogCriteriaIds: string[]) {
     }
 
     dispatch(Actions.setRubric(newRubric));
+    AutorunService.poke();
 
     pxt.tickEvent("teachertool.addcriteria", {
         ids: JSON.stringify(catalogCriteriaIds),
diff --git a/teachertool/src/transforms/loadProjectAsync.ts b/teachertool/src/transforms/loadProjectAsync.ts
deleted file mode 100644
index 135a07012acb..000000000000
--- a/teachertool/src/transforms/loadProjectAsync.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { stateAndDispatch } from "../state";
-import * as Actions from "../state/actions";
-import { postNotification } from "./postNotification";
-import { makeNotification } from "../utils";
-import { setHighContrastAsync } from "../services/makecodeEditorService";
-
-export async function loadProjectAsync(projectId: string, bool: boolean) {
-    const { dispatch } = stateAndDispatch();
-    await setHighContrastAsync(bool);
-    postNotification(makeNotification(`project ${projectId} evaluated`, 2000));
-}
diff --git a/teachertool/src/transforms/removeCriteriaFromRubric.ts b/teachertool/src/transforms/removeCriteriaFromRubric.ts
index 1dfb4f01ed60..6d372e393304 100644
--- a/teachertool/src/transforms/removeCriteriaFromRubric.ts
+++ b/teachertool/src/transforms/removeCriteriaFromRubric.ts
@@ -2,6 +2,7 @@ import { stateAndDispatch } from "../state";
 import * as Actions from "../state/actions";
 import { logDebug } from "../services/loggingService";
 import { CriteriaInstance } from "../types/criteria";
+import * as AutorunService from "../services/autorunService";
 
 export function removeCriteriaFromRubric(instance: CriteriaInstance) {
     const { state: teacherTool, dispatch } = stateAndDispatch();
@@ -14,6 +15,7 @@ export function removeCriteriaFromRubric(instance: CriteriaInstance) {
     };
 
     dispatch(Actions.setRubric(newRubric));
+    AutorunService.poke();
 
     pxt.tickEvent("teachertool.removecriteria", { catalogCriteriaId: instance.catalogCriteriaId });
 }
diff --git a/teachertool/src/transforms/setAutorun.ts b/teachertool/src/transforms/setAutorun.ts
new file mode 100644
index 000000000000..2d40a26bbfae
--- /dev/null
+++ b/teachertool/src/transforms/setAutorun.ts
@@ -0,0 +1,11 @@
+import { stateAndDispatch } from "../state";
+import * as Actions from "../state/actions";
+import * as LocalStorage from "../services/localStorage";
+import * as AutorunService from "../services/autorunService";
+
+export function setAutorun(autorun: boolean) {
+    const { dispatch } = stateAndDispatch();
+    dispatch(Actions.setAutorun(autorun));
+    LocalStorage.setAutorun(autorun);
+    AutorunService.poke();
+}
diff --git a/teachertool/src/transforms/setRubric.ts b/teachertool/src/transforms/setRubric.ts
index 27564be7cf84..d825bbd0688a 100644
--- a/teachertool/src/transforms/setRubric.ts
+++ b/teachertool/src/transforms/setRubric.ts
@@ -1,8 +1,10 @@
 import { stateAndDispatch } from "../state";
 import { Rubric } from "../types/rubric";
 import * as Actions from "../state/actions";
+import * as AutorunService from "../services/autorunService";
 
 export function setRubric(rubric: Rubric) {
     const { dispatch } = stateAndDispatch();
     dispatch(Actions.setRubric(rubric));
+    AutorunService.poke();
 }
diff --git a/teachertool/src/types/errorCode.ts b/teachertool/src/types/errorCode.ts
index 34b6b5f24464..4b310a41def9 100644
--- a/teachertool/src/types/errorCode.ts
+++ b/teachertool/src/types/errorCode.ts
@@ -13,4 +13,6 @@ export enum ErrorCode {
     unableToLoadCriteriaInstance = "unableToLoadCriteriaInstance",
     unableToExportRubric = "unableToExportRubric",
     unableToReadRubricFile = "unableToReadRubricFile",
+    localStorageReadError = "localStorageReadError",
+    localStorageWriteError = "localStorageWriteError",
 }