Readying for PC Submission

You should be fine if you take this file and update your pull request. I will go comment on the lines that need to change on your PC pull request.