Improving.

Still bad, but with less chaos!