Impelemted using object oriented model, deleted old test programs.