Nave Trooper + refactors