adding the submodule references (I think? This merge is messy!)