Initial functionality mostly admin changes