WIP - making reset_counters work