WIP squash - this is it for real