Restructured, and now it works.