Prototype 2

First iteration of prototype 2