General discussion, quite ugly for now.
Merge branch 'general-discussion' into side-branch