Yay for code review, and thanks to jfarrell for pointing out the error of my ways