Roles looks done... Also Fixes #113