Refactored design to be chart based