Rye dev

Trying to merge the rye_dev code to master