ready for pull request

PLEASE NOTE TERMS AND CONDITIONS IS A PORTION OF A DIFFERENT STORY