This doesn't need to be an instance variable, does it? I can fix that after merging.