Changes to merge my farnborough guide code with the starter template and fix the submodules problem I had yesterday