Adding functionality

Change-Id: I1252f1268453ff12dddb65ca409f2f260eb465a8
Signed-off-by: Peter Cummings <peter@socomo.co>