major refactor (diet) (WIP)