Crap. New foundation version. Time to refactor.