Area chart refactoring
WIP