First set of developments finished. Still something fishy with superclusters at runtime