Updates from Sai
v2 prototype
Merge pull request #20 from DevJonny/dev

v2 Prototype