John Kay's Pull Request

To whom it may concern, I am pretty sure my test is complete.  Please take a look at the files and tell me what you think or anything I may have missed. 

Thank You.