Update to code -- new class fully implemented