Big change to code, things are simpler than they first appeared.