messing with merging, some homework stuff is in here