Stuycs apcs z master

Pushed Spencer's code; fixed pull request issue