1 files changed, 24 insertions, 5 deletions
diff --git a/src/ship.rs b/src/ship.rs
index f791809..715f019 100644
--- a/src/ship.rs
+++ b/src/ship.rs
@@ -1,14 +1,33 @@
+use mass::Mass;
+extern crate serde_json;
+
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Ship {
-    pub name        : String,
-    pub location    : (isize, isize, isize),
+    name        : String,
+    location    : (isize, isize, isize),
 }
 
-impl Ship {
-    pub fn new(name : &str) -> Ship {
+impl Mass for Ship {
+    fn new(name : &str, location : (isize, isize, isize)) -> Ship {
         Ship {
             name        : String::from(name),
-            location    : (0,0,0),
+            location    : location,
         }
     }
+
+    fn get_name(&self) -> &String {
+        &self.name
+    }
+
+    fn get_location(&self) -> (isize, isize, isize) {
+        self.location
+    }
+
+    fn give_location(&mut self, location : (isize, isize, isize)) {
+        self.location = location;
+    }
+
+    fn serialize(&self) ->String {
+        serde_json::to_string(self).unwrap()
+    }
 }