Excuse me while I continue try to remember to completely fix in a single commit instead of 3