Updates from leereilly/swot and the addition of Ayb School

If you need to merge my commit separately I can create another pull request with only my commit in it.