changes made during lecture. may have errors.
merge worked