Totally restructured, everything working now.