Got the clean stuff working