First rough premature commit to have something to look at and owrk with...
Merge remote-tracking branch 'github/master'