add new ratings [WIP]
resolve merge conflicts