Refactored cluster.py to use inheritence
removed old code
Fixing conflicts