Added workoiut and recipe database queries, restructured results a bit