add cluster (partially done)
fix conflicts
update