Beginnings of making '-*' default behavior work as expected

Beginnings of making '-*' default behavior work as expected #153