Forget my last commit... Misread the issue. Undoing some of my changes that are not necessary.