Experimenting, removing code that doesn't work

This is it for the night.