Remote roles

Add the ability to have "Hybrid" roles as an option, rather than Remote : Yes/No