restructure
restructure
restructure
updated testing file
something wrong with Zbstarcombine