1. refactor the classes so that the future UI components can better call them