ugh another code review and can we just merge this already? i feel like we've been going back and forth on this for weeks.