Worked on this with Bryan to get a better solution