null team also admin approved

added bool to null
Beginning to reorganize code so functions are grouped