substructure calculator first commit