Working - tidied. Still need to fix shape='any', or rejig that.