Rift support working!
Bla
Bla
Bla
Merged the rift branch