Work on refactoring Contract/children classes to use Factory methods.
cleanup of Contract classes, all should support Mode(s) now, with code included in base class, and not all over every subclass.
Extracted Mode out from Contract2.java, and renamed Contract2.java to Contract.java
-cut length of Contract in half that way, and mode is now not just 'only' in Contract, but all parts.