Make stuff global, no more breakage?