More modular

Weee.