Commit work by Chris and Devin before working on untappd API stuff, which is likely to get messy.