changes from tonight's meeting; final bit of code