Initial Build - Part 2

Commit of missing files from first build.