diff --git a/zaza/model.py b/zaza/model.py
index db34b12..9b0f802 100644
--- a/zaza/model.py
+++ b/zaza/model.py
@@ -1,8 +1,12 @@
 import functools
 
 from juju import loop
-from juju.model import Model
+import subprocess
+import logging
+import sys
+import yaml
 
+from juju.model import Model
 
 async def deployed(filter=None):
     # Create a Model instance. We need to connect our Model to a Juju api
@@ -17,6 +21,58 @@ async def deployed(filter=None):
         # Disconnect from the api server and cleanup.
         await model.disconnect()
 
+def get_unit_from_name(unit_name, model):
+    app = unit_name.split('/')[0]
+    for u in model.applications[app].units:
+        if u.entity_id == unit_name:
+            unit = u
+            break
+    else:
+        raise Exception
+    return unit
+
+async def _scp_to_unit(unit_name, source_file, target_file):
+    model = Model()
+    await model.connect_current()
+    try:
+        unit = get_unit_from_name(unit_name, model)
+        #await unit.scp_to(source_file, target_file)
+    finally:
+        # Disconnect from the api server and cleanup.
+        await model.disconnect()
+
+async def _get_first_unit(app_name):
+    model = Model()
+    await model.connect_current()
+    try:
+        unit = model.applications[app_name].units[0]
+    finally:
+        # Disconnect from the api server and cleanup.
+        await model.disconnect()
+    return unit
+
+def scp_from_unit(unit_name, source_file, target_file):
+    cmd = ['juju', 'scp', '{}:{}'.format(unit_name, source_file), target_file]
+    subprocess.check_call(cmd)
+
+def scp_to_unit(unit_name, source_file, target_file):
+    cmd = ['juju', 'scp', source_file, '{}:{}'.format(unit_name, target_file)]
+    subprocess.check_call(cmd)
+
+def get_status():
+    status = subprocess.check_output(['juju', 'status', '--format', 'yaml'])
+    return yaml.load(status)
+
+def get_first_unit(app_name):
+    status = get_status()
+    return sorted(status['applications'][app_name]['units'].keys())[0]
+
+def get_app_ips(app_name):
+    status = get_status()
+    addresses = []
+    for unit in status['applications'][app_name]['units'].values():
+        addresses.append(unit['public-address'])
+    return addresses
 
 def get_unit_from_name(unit_name, model):
     """Return the units that corresponds to the name in the given model
@@ -246,7 +302,7 @@ def get_app_ips(model_name, application_name):
 def main():
     # Run the deploy coroutine in an asyncio event loop, using a helper
     # that abstracts loop creation and teardown.
-    print("Current applications: {}".format(", ".join(loop.run(deployed()))))
+    print("Current applications: {}".format( ", ".join(loop.run(deployed()))))
 
 
 if __name__ == '__main__':