Some progress.

Next big thing is getting Synthetic control commands right.