Stripped mockup to contain only features that will come to v1.0