Sidegrade, attempting to clean code up to remove class parenting error