Cancelling flok99's commits until they are tested
Moved them to 'experimental' branch until we can test them, and we have updated the examples to work with the new functions