Mostly for the modularity branch. I can show you more about how to do this, just making this issue to remind us.
