Updated school retrieval to be based upon address rather than bounds
Fixed merge
Merged again