Updated, added gen_identity class (in progress)