added submodules (hopefully right, this time)