Stage 1: adding submodules