License 2

@BrettASwift 

Might be easier to go through a commit at a time, so you can see the "real" changes more easily...  It all appears to work, so I think I did it right. :)