The way forward

Going to try taking out one wacky experiment at a time, and see if we can straighten it out to compile with upstream