NEEDS JOHN WILLIS'S BIO BEFORE MERGING - PLEASE DONT MERGE YET