Second phase - Added more flesh to the skeletons.
Merge remote-tracking branch 'origin/master'