complete initialize setup
Merge pull request #1 from jcward10/erins-branch

complete initialize setup