Restructured the code. Still broken.