BUGGY! Interim commit.