WIP commit. There's an issue in main that's causing compilation to fail. Also, this strategy doesn't appear to result in clear winner so may need to devise another approach.