Missing bits and pieces from prototype.