- Refactor chart code
- Refactor pushing/popping