diff --git a/y2018/control_loops/BUILD b/y2018/control_loops/BUILD
new file mode 100644
index 0000000..57f2864
--- /dev/null
+++ b/y2018/control_loops/BUILD
@@ -0,0 +1,6 @@
+py_library(
+    name = "python_init",
+    srcs = ["__init__.py"],
+    visibility = ["//visibility:public"],
+    deps = ["//y2018:python_init"],
+)
diff --git a/y2018/control_loops/__init__.py b/y2018/control_loops/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/y2018/control_loops/__init__.py
diff --git a/y2018/control_loops/python/BUILD b/y2018/control_loops/python/BUILD
index 89f8882..eebbfe2 100644
--- a/y2018/control_loops/python/BUILD
+++ b/y2018/control_loops/python/BUILD
@@ -5,8 +5,10 @@
     srcs = [
         "drivetrain.py",
     ],
+    legacy_create_init = False,
     restricted_to = ["//tools:k8"],
     deps = [
+        ":python_init",
         "//external:python-gflags",
         "//external:python-glog",
         "//frc971/control_loops/python:drivetrain",
@@ -19,8 +21,10 @@
         "drivetrain.py",
         "polydrivetrain.py",
     ],
+    legacy_create_init = False,
     restricted_to = ["//tools:k8"],
     deps = [
+        ":python_init",
         "//external:python-gflags",
         "//external:python-glog",
         "//frc971/control_loops/python:polydrivetrain",
@@ -47,9 +51,11 @@
     srcs = [
         "polydrivetrain_test.py",
     ],
+    legacy_create_init = False,
     restricted_to = ["//tools:k8"],
     deps = [
         ":polydrivetrain_lib",
+        ":python_init",
         "//external:python-gflags",
         "//external:python-glog",
         "//frc971/control_loops/python:controls",
@@ -63,8 +69,10 @@
         "arm_trajectory.py",
         "path_points.py",
     ],
+    legacy_create_init = False,
     restricted_to = ["//tools:k8"],
     deps = [
+        ":python_init",
         "//external:python-gflags",
         "//external:python-glog",
         "//frc971/control_loops/python:controls",
@@ -76,11 +84,14 @@
     srcs = [
         "intake.py",
     ],
+    legacy_create_init = False,
     restricted_to = ["//tools:k8"],
     deps = [
+        ":python_init",
         "//external:python-gflags",
         "//external:python-glog",
         "//frc971/control_loops/python:controls",
+        "@matplotlib",
     ],
 )
 
@@ -104,9 +115,12 @@
         "graph_edit.py",
         "graph_generate.py",
     ],
-    # Sigh, these aren't respected.
     default_python_version = "PY3",
+    legacy_create_init = False,
     srcs_version = "PY3",
+    deps = [
+        ":python_init",
+    ],
 )
 
 py_binary(
@@ -115,7 +129,17 @@
         "graph_codegen.py",
         "graph_generate.py",
     ],
-    # Sigh, these aren't respected.
     default_python_version = "PY2",
+    legacy_create_init = False,
     srcs_version = "PY2",
+    deps = [
+        ":python_init",
+    ],
+)
+
+py_library(
+    name = "python_init",
+    srcs = ["__init__.py"],
+    visibility = ["//visibility:public"],
+    deps = ["//y2018/control_loops:python_init"],
 )
diff --git a/y2018/control_loops/python/__init__.py b/y2018/control_loops/python/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/y2018/control_loops/python/__init__.py
diff --git a/y2018/control_loops/python/intake.py b/y2018/control_loops/python/intake.py
index a9479e0..4fb4f1e 100755
--- a/y2018/control_loops/python/intake.py
+++ b/y2018/control_loops/python/intake.py
@@ -4,7 +4,6 @@
 from frc971.control_loops.python import controls
 import numpy
 import sys
-import matplotlib
 from matplotlib import pylab
 import gflags
 import glog