Tweaks to allow for testing.
This approach takes too long.