Table Changes

Tested on AAMC - Indexes to come
Merge branch 'master' of https://github.com/DRrEW/WMA