Need to figure out how to not repeat in each package