DOESN'T WORK - some crazy stuff I've been experimenting with in the test
merge master