Finish implementing counts