Fix for merge conflics. Added closing brackets and commented out unfinished referances.
Merge pull request #9 from ticoombs/branch

Fix for after merge conflicts. Commented out unfinished code.