Completed functionality with a simple test.
Changed the termination interface.