added gems
migrated users and annotated