added basic support for norid (lots still missing)