TODO comment
push --without options
unit test for without
Enable without for 'features' as well