finished stuff
Merge branch 'master' of https://github.com/raywu22/ShireAWAP