Adding submodules (cross fingers)
Removing unwanted cruft