Flair final solution. 80% approval from community. Fixes #77.