Started looking at composite functionality
Fixed a woopsy in the tests, need to make tx recursive though to prevent it happening again