Initial commit. Skeleton.
Fixed conflicts.