More work on prototype.