This is Garrett's first commit to get on the same page