refactored count tags, pushing to oolite for testing