Moved some stuff to the prototype level.