Changed the System System (sounds odd doesn't it?) to use my IEndable interface for more ease of use.