Resolved a merge conflict... PART TWO THE REVENGENCING! For real this time.