v 0.3.1 refactored

major Subset refactoring in process