Initial commit of working scaffold.
Merge commit '36c41ed4e1fa8a53218aad739667bcd2f477e00c'