s4 addns: Trying to get the s4 build working