Merge in some additional codeine progress