Added cluster support, still need src cleanup and design.