Added Andrew's work done since 14-12-2014
Fixed issues so that solution can be built
Work done on 21-12-2014