Changes for adding school - not yet complete