de-modularising for the win!