Module-ize the stuff

This makes a boolean parameter available!