Moved functions into functions.hh.  Things are moving along.  Still unstable.

Correction run support is almost there.