Progress on project management stuff. Just making the basic structures..
Merge remote-tracking branch 'origin/master'