Callings

Take a look, let me know if you catch anything. The update script has been brought up to date with the new callings stuff. Everything seems to be working as far as this branch is concerned. (In the future we'll need to add some tests so I can quantify statements like that :-)