Incremental commit

Unit tests still broken, not convinced that the approach is sound.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>