development work (16/12/14)

Signed-off-by: Callum Macdonald <callum@redevolution.com>