Prototype revision

This is a mass commit of the prototype revision