diff --git a/__init__.py b/__init__.py
index 0e4362516f0bb16ad47ea083bf30c1f5c9d71077..87a153fab96f452f018ec325442bcc5e389addcb 100644
--- a/__init__.py
+++ b/__init__.py
@@ -12,6 +12,8 @@ from st3m.ui.interactions import ScrollController
 from st3m.ui.colours import *
 from st3m.ui.view import ViewTransitionSwipeLeft
 from st3m.application import Application, ApplicationContext
+from st3m.input import InputState
+from ctx import Context
 import st3m.run
 import st3m.settings
 import leds
diff --git a/connecting.py b/connecting.py
index 07edb6fbfe44acc156b88033687d4f8cadc88f02..afb236200b94b32a1fa2ca14bb8bba427bc5e0b6 100644
--- a/connecting.py
+++ b/connecting.py
@@ -8,6 +8,8 @@ if __name__ == '__main__':
     __path__ = None
 
 from st3m.ui.view import BaseView, ViewTransitionBlend, ViewTransitionDirection
+from st3m.input import InputState
+from ctx import Context
 import st3m.run
 import st3m.wifi
 import st3m.settings
diff --git a/difficulty.py b/difficulty.py
index 9b15f5978be413ffdbbb888ac205860fb13fe03b..a6b2169cacc1126a242e166c6143e59124f48053 100644
--- a/difficulty.py
+++ b/difficulty.py
@@ -1,5 +1,7 @@
 from st3m.ui.view import BaseView, ViewTransitionBlend
 from st3m.ui.interactions import ScrollController
+from st3m.input import InputState
+from ctx import Context
 import math
 try:
     import media
diff --git a/download.py b/download.py
index 16c6378af51d08a67d44d0203bf0a4f9dafd4f7b..2d053b546716d5b0f6f76da5bf5ed88729e202c5 100644
--- a/download.py
+++ b/download.py
@@ -8,6 +8,8 @@ if __name__ == '__main__':
     __path__ = None
 
 from st3m.ui.view import BaseView, ViewTransitionBlend, ViewTransitionDirection
+from ctx import Context
+from st3m.input import InputState
 import st3m.run
 import math
 import random
diff --git a/flower.py b/flower.py
index 6be82b2976c74256be8b61dc1b33cefe460d939e..ee28f6f02637fd526c8360b75cea785563d9e7f7 100644
--- a/flower.py
+++ b/flower.py
@@ -1,3 +1,5 @@
+from ctx import Context
+
 class Flower:
     def __init__(self, rot_speed: float, x = 0, y = 0, scale = 1.0) -> None:
         self.rot = 0.0
diff --git a/loading.py b/loading.py
index 72be4a07f43f4bd13fb6b425a1b650fd6ca48c84..16a1190c8fab3fc3ab2bc519846bd4d1e5b5fcb7 100644
--- a/loading.py
+++ b/loading.py
@@ -1,4 +1,6 @@
 from st3m.ui.view import BaseView, ViewTransitionBlend
+from st3m.input import InputState
+from ctx import Context
 import gc
 import time
 
diff --git a/score.py b/score.py
index 937e34548863f409e54b7c7d19f7becee6f9afcc..cf96ac6828d8901acf9283bff3513c68e1491418 100644
--- a/score.py
+++ b/score.py
@@ -1,4 +1,7 @@
 from st3m.ui.view import BaseView, ViewManager, ViewTransitionBlend
+from st3m.input import InputState
+from ctx import Context
+from st3m.goose import Optional
 import st3m.run
 import math
 import random
diff --git a/select.py b/select.py
index 2e5547ac287dcf3d4ae5d0323a9955d3d5748838..bbc1c8995ff2aa8a86a8ffaabb3b1683e765743f 100644
--- a/select.py
+++ b/select.py
@@ -1,5 +1,8 @@
 from st3m.ui.view import BaseView, ViewManager, ViewTransitionSwipeLeft, ViewTransitionBlend
+from st3m.input import InputState
 from st3m.ui.interactions import ScrollController
+from st3m.goose import Optional
+from ctx import Context
 import math
 import os, stat
 import time
diff --git a/song.py b/song.py
index 2d5c537efa8ccbeb61006f7711772257a79b057a..b35b440b52ecc32fdef22b73f0e89d1d0a159e9a 100644
--- a/song.py
+++ b/song.py
@@ -1,6 +1,9 @@
 from st3m.ui.view import BaseView, ViewManager, ViewTransitionSwipeRight, ViewTransitionBlend
+from st3m.input import InputState
 from st3m.ui.colours import *
 from st3m.utils import tau
+from ctx import Context
+from st3m.goose import Optional
 import st3m.run
 import math
 import leds