Wonder if this is could be done slightly differently. I will look into it once I pull this in