First Dev Commit v2
Switching to work on Prototype