CW: Refactoring for ease of upgrading to generic data retrieval
CW: Added dynamic text display capability