Prototype 2.5

Second Iteration of prototype 2 -10/12/14