Branch 0.03

Next step to the prototype!