contp changed from dict to class to add functionality
ystar with t-dep, unittest fixes #10