whoops -- better var naming, and actually putting it to use