First commit for showcase
Merge of two versions
Showcase ready