Bunch of changes from real-world.  Kind of broken now.