WIP on RVM support