diff --git a/src/run.rs b/src/run.rs
index 7d0a187..76d5897 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -7,7 +7,6 @@ pub enum InvalidationReason{
 
 #[derive(Debug)]
 pub enum Error{
-	Timer(TimerError),
 	AlreadyStarted,
 	NotStarted,
 	AlreadyFinished,
@@ -19,12 +18,16 @@ impl std::fmt::Display for Error{
 }
 impl std::error::Error for Error{}
 
+enum RunState{
+	Created{timer:Timer<Paused>},
+	Started{timer:Timer<Unpaused>},
+	Finished{timer:Timer<Paused>},
+}
+
 pub struct Run{
-	timer:Timer<Scaled>,
 	invalidated:Option<InvalidationReason>,
 	created:Time,
-	started:Option<Time>,
-	finished:Option<Time>,
+	state:RunState,
 }
 
 impl Run{