Ok, leaving it alone now. Time to TEST