new models
cleaned up repo, added rings