merging zach and I's coding together