Hope I'm doing this right

Trying to get the latest changes from the master, if that's not what I'm doing, ignore this.