Lates working changes
Completed Prototype.