Merge changes for initial draft of project.