Correct count implementation

Moved experimental and faster implementation to the rapid-count branch.

Signed-off-by: Eli Skeggs <eskeggs@globesherpa.com>