Switched to hasing system. Moved several methods to container object.