WIP for preview Flavia - do not merge it yet. Feel free to comment it via github.