Initial Merge

This initial merge almost completely builds.