Continued stubbing.

Still a major work in progress.