Initial changes.

Probably doesn't work yet.