replaced mockups with the real stuff
Merging with last commits