Trying to merge changes. There are a lot from Luke here.