More porting of the prototype code.