rayfm dev branch