All finished but oponent_view
Fixed merge conflicts