We are going to move in all pieces that are part of the demo to work into master. The work is based on @marius, @fd is going to move them in, and then give to @marius for review. The basic condition is to maintain the well function of the demo for this MR.