Need to fix code and condense methods
Merge branch 'master' of github.com:GuyWithTheGlasses/APCShw