Cleanups and subfunction test.
Backing it up.