More work on backend stuff.  Have a failing test I'm fixing.