wip: refactored accounting and added charge applied event