Nick's commit for django server-side code3