The commit got way too big... I'm going to have to go back here and figure out why I did that. Oops.