Development - 29/01/2014

Just an initial attempt at getting some basic functionality working. 

Merging into master for testing.