We'll need to do this with the other parts as well. Navigating this module has become practically impossible