Adding a base class for AvatarManager called AvatarHashMap.  It just the list management stuff pulled out of AvatarManager and it holds pointers to AvatarData (the base class to Avatar) which is exposed to the ParticleCollisionSystem (and other things that live in the libraries).