Latest update of prototype

Lots of changes..