Must remember to actually generate diet when merging phil's branch