It looks like a lot of this code isn't being used in the app.  Before merging, we'll want to kill anything that isn't.