Add some more functionality to scarbre