finished Good and GoodType

needs javadoc-ing
Merge branch 'kristen'