Finally making some progress.

Finally making some progress.