Initial work on modularising integrations.