Ugh... made enough changes that the lines numbers are impossible to follow now.