Count is now working.  Also refactored the Types enum to be an atomic int.