Added an analog hookup.

Moved a few things, but not much.