diff --git a/assignment-2a/src/state.h b/assignment-2a/src/state.h
index 2045bf1..235c490 100644
--- a/assignment-2a/src/state.h
+++ b/assignment-2a/src/state.h
@@ -1,9 +1,23 @@
 #ifndef STATE_H_
 #define STATE_H_
 
+#include <optional>
+#include <utility>
+
+using namespace std;
+
+typedef pair<int, int> pii;
+
 /// The state of the program
 struct State {
-  int mouse_x, mouse_y;
+  pii mouse;
+
+  /// Where the dragging started (if it started)
+  optional<pii> drag_start;
+
+  /// Scaling factors
+  double x_scale = 1.0;
+  double y_scale = 1.0;
 };
 
 #endif