2 files changed, 23 insertions, 10 deletions
diff --git a/src/entities/character.rs b/src/entities/character.rs
index f436608ea5e7..fb5a89591c95 100644
--- a/src/entities/character.rs
+++ b/src/entities/character.rs
@@ -1,13 +1,13 @@
+use crate::display;
+use crate::entities::Entity;
+use crate::types::{Position, Speed};
 use proptest_derive::Arbitrary;
 use std::io::{self, Write};
 use termion::cursor;
 
-use crate::display;
-use crate::types::{Position, Speed};
-
 const DEFAULT_SPEED: Speed = Speed(100);
 
-#[derive(Debug, PartialEq, Eq, Arbitrary)]
+#[derive(Debug, PartialEq, Eq, Arbitrary, Clone)]
 pub struct Character {
     /// The position of the character, relative to the game
     pub position: Position,
@@ -26,13 +26,12 @@ impl Character {
 }
 
 positioned!(Character);
+positioned_mut!(Character);
+
+impl Entity for Character {}
 
 impl display::Draw for Character {
-    fn do_draw<W: Write>(&self, out: &mut W) -> io::Result<()> {
-        write!(
-            out,
-            "@{}",
-            cursor::Left(1),
-        )
+    fn do_draw(&self, out: &mut Write) -> io::Result<()> {
+        write!(out, "@{}", cursor::Left(1),)
     }
 }
diff --git a/src/entities/mod.rs b/src/entities/mod.rs
index 0320f2ddd9c1..a23b15eef34c 100644
--- a/src/entities/mod.rs
+++ b/src/entities/mod.rs
@@ -1,2 +1,16 @@
 pub mod character;
+use crate::display::Draw;
+use crate::types::{Positioned, PositionedMut};
 pub use character::Character;
+use downcast_rs::Downcast;
+use std::io::{self, Write};
+
+pub trait Entity: Positioned + PositionedMut + Draw + Downcast {}
+
+impl_downcast!(Entity);
+
+impl Draw for Box<dyn Entity> {
+    fn do_draw(&self, out: &mut Write) -> io::Result<()> {
+        (**self).do_draw(out)
+    }
+}