Refactor Count module

 - Fully refactor the module
 - Add specs for count stuff