Saucy

An attempted culmination of all the work in #236, #239, and #255. Let's see what happens!