Basic structure. Untested so far.
Merge remote-tracking branch 'origin/master'