Porting Walt's dinerl query code in.  Pretty straightforward