Added in Changes from Tripp

Multiple Changes by Tripp
Coding Convention

I have to do it, don't hate