still working on the recipe stuff
merging stuff