oop version
removed doubled files
Merge pull request #14 from MattFlaig/t16

T16