Feature/subset

This is ready for prime time