@mastergreg Refactored out the data